Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix 3 #378

Open
wants to merge 49 commits into
base: master
Choose a base branch
from

Conversation

Farrellka-dev
Copy link
Contributor

@Farrellka-dev Farrellka-dev commented Jan 6, 2025

image

Описание обновления:

Медиа

Проверки

  • PR завершён и мне не нужна помощь чтобы его закончить.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.
  • Я не добавлял контент нарушающий чужие авторские права.
  • Я добавил свой контент только в папку _LostParadise(только если вы не меняете оригинальный код).
  • Я не добавлял переводы в прототипы, а сделал их с помощью скрипта translations.bat в Tools/SS14_RU.

Изменения

sleepyyapril and others added 30 commits January 4, 2025 14:19
# Description
This ports the Guidebook Tables to allow \<Table\> and \<ColorBox\>
embeds in the Guidebook.
This just adds extra XML tags to use in rich-text.

---

# TODO
- [x] Cherry-Pick the PR.
- [x] Tested to make sure it works. It does actively work.

---

# Media
<details><summary><h3>Guidebook Screenshot</h3></summary>
<p>

![image](https://github.com/user-attachments/assets/289e4c72-dcef-4489-b89e-5a2d6367124f)
</p>
</details>

NOTE: This screenshot was taken in the dev-environment. I just
copy-pasted my SOP for Alert Levels to check it, since it uses both the
\<Table\> and \<ColorBox\> identifiers.

---

# Changelog
:cl:
- add: Added <Table> and <ColorBox> identifiers. Go wild in SOP!

Co-authored-by: Nemanja <[email protected]>
# Description
This adds several different launch types to the VSCode. This allows you
to launch Client in Compatibility Mode for the Tools/Release versions as
well as launch the Server/Client at the same time in Tools/Release modes
and use the VSCode Terminal.

---

# TODO
- [x] Add different Build types in the tasks.json file.
- [x] Add different Launch types in the launch.json file.

---


![image](https://github.com/user-attachments/assets/c7ba1f8b-82e8-4f3c-9c19-cfc3d12cc978)
# Description

Adds male Lamia with facial hair. Also makes dozens of markings
available to Lamiae, including reptilian markings and pointy ears.

Also adds locale strings for the Lamia tail marking.

## Media

**Mermaid**


![image](https://github.com/user-attachments/assets/83c03899-dc64-45fa-a694-f0d88f2ec136)

**Face:** Lips, Blush
**Head:** Left Eye
**Head (Top):** Lizard Horns (Ayrshire)
**Head (Side):** Thin Ears, Drop Earrings (Left/Right)
**Chest:** Lizard Chest (Tiger)
**Right Arm:** Right Arm Bracelet
**Right Hand:** Right Bracelet, Right Nail Polish
**Left Hand:** Left Bracelet, Left Nail Polish

**Male**


![image](https://github.com/user-attachments/assets/addb6a4d-30b6-49d6-9cb6-6b6979d8a6c0)


![image](https://github.com/user-attachments/assets/4f09943b-a025-4cfa-a87a-0dc885993e5c)

**Face:** Eyelash (Left/Right), Eye Corner (Left/Right)
**Head (Top):** Lizard Horns (Angler)
**Head (Side):** Lizard Frills (Short)
**Chest:** Lizard Chest (Tiger)
**Right Arm:** Lizard Right Arm (Tiger)
**Right Hand:** Right Watch (Colorable)
**Left Arm:** Lizard Right Arm (Tiger)
**Overlay:** Gauze Handwrap

**Red**


![image](https://github.com/user-attachments/assets/c288799c-c136-4aaa-97a0-78452c5cbfaa)

**Face:** Lips
**Head (Top):** Lizard Horns
**Head (Side):** Upward Ears
**Right Hand:** Right Robotic Hand from Bishop Cybernetics
**Left Hand:** Left Robotic Hand from Bishop Cybernetics, Left Gold
Watch

**Lamia locale**


![image](https://github.com/user-attachments/assets/122d223a-a5d3-4efe-baed-268115e5ecb2)

![image](https://github.com/user-attachments/assets/c8effc4b-499d-417e-bd91-54f4526fde57)

## Changelog

:cl: Skubman
- add: Lamiae can now be male, no longer being a female-only species.
They can now wear facial hair as well.
- add: The Lamia species can now select markings above the leg,
including cybernetics, makeup, tattoos, noses, earrings, heterochromia,
bracelets, reptilian horns and frills, pointy ears, and more!
- fix: Added text for the Lamia tail marking.
# Description

Bug fixes:

- Re-enable damage examine for embeddable passive damage after the
Wizmerge for Station AI wiped it
(Simple-Station/Einstein-Engines#1351)
- Fixed a bug where emags did not have embed passive damage (due to
`DamageOtherOnHitStartupEvent` only raising when `MeleeWeaponComponent`
exists on the entity)

Tweaks:

- Added a stamina cost to spears, 6 stamina, and removed spears dealing
damage to itself when thrown
- Floor tiles will now break when thrown 10 times instead of 4 times
- Added the MetalThud sound effect for structures when thrown, and
increased the base thrown damage of structures slightly from 8 to 9

Damage examine is now sorted properly. From top to bottom:
- Gun damage
- Melee weapon damage
- Throwing weapon damage
- Embed passive damage

## Media

**Laser rifle sorted damage examine**


![image](https://github.com/user-attachments/assets/6fe2a47b-b354-415a-8835-8f0e33c6da00)

**Spear sorted damage examine**


![image](https://github.com/user-attachments/assets/0c93c125-08ce-4e5b-9af9-5c5ceddcd3b1)

**Emag stats**


![image](https://github.com/user-attachments/assets/ac9b1073-b209-4a44-badf-8f8ec9f8514a)

## Changelog

:cl: Skubman
- fix: Fixed embeddable damage over time not showing when examining an
item's damage values.
- fix: Fixed the emag not dealing passive damage when embedded on a
target.
- tweak: Examining an item's damage values now shows values in a sorted
order. From top to bottom: gun damage, melee damage, throwing damage,
embedded damage.
- tweak: Spears now have a 6 stamina cost when thrown, and they no
longer break when thrown enough times.
- tweak: Floor tiles now break when thrown 10 times instead of 4 times.
- tweak: Closets, lockers and crates now play the proper sound effect
when thrown (by Space Wind).
# Description

Adds two new traits, Steadfast and Feeble that modify how affected a
character is by injury slows.

Steadfast (-4 points)
- 25% slow at 60 damage -> 17% slow at 70 damage
- 45% slow at 80 damage -> 30% slow at 90 damage

Feeble (4 points)
- 25% slow at 60 damage -> 30% slow at 45 damage
- 45% slow at 80 damage -> 54% slow at 65 damage

Also *half-reverts* the reduction of injury slows from a Delta-V PR by
ODJ (DeltaV-Station/Delta-v#741) from 30%/50% to
20%/40%, now 25%/45% to incentivize taking Steadfast.

The injury slow resists for jackboot and combat boots has been nerfed
from 50% to 20% to account for Steadfast.

IPCs' injury slow at 60 damage has been decreased from 30% to 25% to be
more consistent with other species.

## Technical details

No trait with jackboots:
- 25% slow -> 20% slow
- 45% slow -> 36% slow

Steadfast with jackboots:
- 17% slow -> 13.6% slow
- 30% slow -> 24.5% slow

Feeble with jackboots:
- 30% slow -> 24% slow
- 54% slow -> 43.2% slow

Although Feeble with jackboots has lower slow values than the base
slows, the slow damage thresholds (-15) are still lower, making the
slows occur with less damage.

## Media

**Steadfast**


![image](https://github.com/user-attachments/assets/8b804040-7f0f-4a49-b0cf-1a83efd4c790)

**Feeble**


![image](https://github.com/user-attachments/assets/a1759f49-f68c-4cc4-991b-b6864e67e016)

**Jackboots**


![image](https://github.com/user-attachments/assets/67132fd0-5a97-43f1-a714-a9deae26f825)

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl: Skubman
- add: Added two new traits: Steadfast and Feeble that decrease or
increase the effect of slows from injuries.
- tweak: Injury slows for most species has been slightly increased, but
this can be mitigated with the Steadfast trait.
- tweak: The jackboots' injury slow resistance has been decreased from
50% to 20%.
- tweak: Combat boots now add resistance to injury slows like jackboots.

---------

Signed-off-by: Skubman <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
# Description

This is a port of Fansana/floofstation1#445
Except I despise that this wasn't upstreamed so much that I didn't even
cherrypick it.

# Changelog

:cl:
- add: Footprints are now cleaned in a small radius around the mouse
cursor when mopping them.
# Description

Prevents entities who are Pacified (through the Pacifist trait or being
a thief) from throwing items that deal damage on hit or embed.

## Technical Details

Two components will prevent throwing if they deal any damage:
`DamageOtherOnHitComponent` and `EmbedPassiveComponent`.

The pacifist check on `EmbeddableProjectileComponent` has been removed,
because just because an item is embeddable does not mean they deal
damage.

## Media

**Throw attempt with the Pacifist trait**


![image](https://github.com/user-attachments/assets/6c439bb3-b41b-4f30-975d-4fa15c2cfa6d)


# Changelog

:cl: Skubman
- fix: Pacified characters (Pacifist trait and thieves) can no longer
throw items that deal throwing damage.

---------

Signed-off-by: VMSolidus <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
# Description

Parkour Training, Sluggish and Snail-Paced have been reworked to be more
impactful in everyday space life. A new trait has been added, Bad Knees.

**Parkour Training** (-5 points)
- No longer modifies laying down
- Climbing speed bonus reduced from 65% to 50%
- 30% shorter slip stuns
- 50% resistance against slows in difficult terrain
- Example: Spider webs inflict a 50% slow, reduced by 50% results in a
25% slow.

Notably, the reworked Parkour Training is much closer to the CDDA trait
[Parkour
Expert](https://cddawiki.danmakudan.com/wiki/index.php/Parkour_Expert).

Difficult terrain examples: Spider webs, slime/blood puddles, kudzu,
space glue

**(NEW)** **Bad Knees** (3 points)
- Designed to be the opposite of Parkour Training
- 50% climbing speed penalty
- 40% longer slip stuns
- 35% increased slows in difficult terrain
- Example: Spider webs inflict a 50% slow, increased by 35% results in a
67.5% slow.

Inspired by the CDDA trait of the same name [Bad
Knees](https://cddawiki.danmakudan.com/wiki/index.php/Bad_Knees).

The stun time for banana peels and puddles is 3 seconds. With Bad Knees,
the stun is increased to 4.2 seconds. The time it takes to handcuff
someone is 3.5 seconds. Go figure :trollface:

**Sluggish** (3 points)
- No longer increases the time for laying down and climbing tables
(given to Bad Knees instead)
- Speed penalty increased from 15% to 16%

**Snail-Paced** (5 points)
- No longer increases the time for laying down and climbing tables
- Speed penalty increased from 30% to 32%
- No longer prevents you from slipping when running due to how slow your
sprint speed is. Snail-Paced trait users must suffer.

## Media

**Parkour Training**


![image](https://github.com/user-attachments/assets/b320d18a-7ac8-419d-b783-28a4d3ac0bb5)

**Bad Knees**


![image](https://github.com/user-attachments/assets/caa64d6a-a58b-4378-a947-0a5f3f6e70a6)

**Sluggish**


![image](https://github.com/user-attachments/assets/7f9ac71f-475f-4aa9-8e36-b93aaad12670)


**Snail-Paced**


![image](https://github.com/user-attachments/assets/faf70f4b-2911-4d03-a72a-99972838b7f9)


## Changelog

:cl: Skubman
- tweak: The Parkour Training trait has been reworked. It no longer
makes you lie down or get up faster, but grants you 30% shorter slip
stuns and 50% resistance against slows in difficult terrain.
- tweak: The Sluggish and Snail-Paced traits now only reduce your
movement speed with no other effects. The speed reductions have been
slightly increased from 15% to 16% for Sluggish, and 30% to 32% for
Snail-Paced.
- add: Added a new 3-point negative trait called Bad Knees. It is the
opposite of Parkour Training and it makes you climb tables slower,
stunned for longer against slip stuns, and move more slowly in difficult
terrain.
- tweak: Snail-Paced no longer prevents you from slipping when running.
# Description

Removes the marking limits for the Face category (was limited to 1
marking) for all non-IPC species, now having unlimited markings as
designed.

Moth makeup (Moth Blush / Moth Lipstick) is now usable again in the Face
category.

## Media

**Markings without limits**


![image](https://github.com/user-attachments/assets/768c4d8b-d982-4836-a57c-1be17e48a33f)

**Lizard with frills and earrings**


![image](https://github.com/user-attachments/assets/1cd4902d-e187-496b-950f-2113655d02c3)

**Moth Makeup**


![image](https://github.com/user-attachments/assets/29236624-c417-4ee6-bf91-e9f80acf8216)

# Changelog

:cl: Skubman
- fix: The Face marking category now has unlimited markings for all
species apart from IPCs.
- fix: Moth People can now apply Moth makeup markings again in the Face
category.
- tweak: Unathi now have 3 'Head (Side)' marking points available, so
they can use frills and both left and right-side earrings.
# Description

Lamia don't have feet, so they instead make huge drag marks when moving
through puddles. :)

# Changelog

:cl:
- fix: Lamia now make drag marks when moving through puddles instead of
regular footprints.
# Description

This is a pretty easy one line fix.
# Description

Apparently this bug was introduced by Shitmed. Pun Pun (And monkeys)
were appearing with completely black sprites. This led to numerous
situations where characters would ask, "WHY IS PUN PUN WEARING
BLACKFACE?"

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/user-attachments/assets/0ad92f9e-4102-43d2-8e42-f7c4320e6e03)

</p>
</details>

# Changelog

:cl:
- fix: Confiscated Pun Pun's blackface.
# Description

Fixes some various issues with language related traits, such as Mimes
being able to take the Mute trait for "Free points", Foreigner being
able to be combined with Mute for "Free Points", etc. Foreigner being
able to be taken by Mimes for "Free Points". Also stuff like the "Rare"
languages giving you points instead of costing points, Sign Language
being the "Best Language" because its mechanically better and free, so
now it costs points, etc.

# Changelog

:cl:
- tweak: Mimes can no longer take the Muted or Foreigner traits. 
- tweak: "Rare" languages like Sinta'Azaziba, Valyrian Standard, now
cost points instead of giving points.
- tweak: Sign Language now costs points.

---------

Co-authored-by: sleepyyapril <[email protected]>
Co-authored-by: KyuPolaris <[email protected]>
Co-authored-by: sleepyyapril
<[email protected]>

# Description

This is a port of 
TheDenSS14/TheDen#42
TheDenSS14/TheDen#109
Thanks a bunch April!

This is mainly adding a ton of clothing items from Frontier. 

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/user-attachments/assets/de1195cb-0e9e-4656-b3f5-2c18968f286c)


![image](https://github.com/user-attachments/assets/7af66438-3df7-4430-b001-44029061a136)

</p>
</details>

# Changelog

:cl:
- add: Ported a ton of new clothing items from Frontier

---------

Co-authored-by: sleepyyapril <[email protected]>
Co-authored-by: Tabitha <[email protected]>
Co-authored-by: KyuPolaris <[email protected]>
# Description

My last change to Pirate Radio made it so that it doesn't spawn at all.
So this PR updates it to instead use a more accurate "Use the spawnable
station" check. By picking a random valid spawnable station(in case
there's more than one).

# Changelog

:cl:
- fix: Fixed the Syndicate Listening Post not correctly spawning.

Co-authored-by: sleepyyapril <[email protected]>
# Description

**(Use a MERGE COMMIT, not squash if possible to ~~avoid~~ reduce merge
conflicts for our downstream)**

Cherry-picks some PRs from The Den:

- TheDenSS14/TheDen#8
- TheDenSS14/TheDen#31
- TheDenSS14/TheDen#108
- TheDenSS14/TheDen#116
- TheDenSS14/TheDen#117
- TheDenSS14/TheDen#123
- TheDenSS14/TheDen#124

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl: The Den Contributors
- fix: Put actual prescription lenses in the prescription medhuds and
sechuds (by KyuPolaris)
- add: Added the CMO turtleneck and head mirror to the CMO loadouts. (by
sleepyyapril, KyuPolaris)
- add: Added an armored trenchcoat for the Captain. Enjoy your swag! (by
Rosycup)
- fix: Fixed uneven pants leg on summer security uniforms. (by Rosycup)
- add: Added the Captain's Combat Gas Mask, for those more fond of close
encounters. (by Rosycup)
- tweak: Added the Captain's Trenchcoat to the other captain locker
variants. (by Rosycup)
- fix: Fixed they/them pronouns being displayed for it/its characters in
the character preview. (by Azzy)

---------

Co-authored-by: flyingkarii <[email protected]>
Co-authored-by: sleepyyapril <[email protected]>
Copy link
Contributor

coderabbitai bot commented Jan 6, 2025

Important

Review skipped

More than 25% of the files skipped due to max files limit. The review is being skipped to prevent a low-quality review.

55 files out of 138 files are above the max files limit of 75. Please upgrade to Pro plan to get higher limits.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Обзор

Walkthrough

Изменения затрагивают роль Административного Ассистента в системе. Обновлены требования к должности, включая возрастные ограничения (25-80 лет) и требования к отработанному времени в различных отделах. Стартовое снаряжение было модифицировано: заменены PDA, гарнитура и добавлены новые предметы экипировки. Также внесены изменения в конфигурацию трекеров игрового времени, точек спавна и обновлены идентификационные карты. Дополнительно изменены ограничения по видам для некоторых маркеров, а также обновлены лимиты маркировки для человека. Изменения в правилах игры включают удаление нескольких событий и правил, а также добавление новых свойств.

Changes

Файл Изменения
Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml - Обновлены требования к возрасту и времени работы
- Изменено стартовое снаряжение (PDA, гарнитура, рюкзак)
Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml - Удалены трекеры для некоторых профессий
- Комментарий о переименовании Administrative Assistant
Resources/Prototypes/_LostParadise/Entities/Markers/Spawners/jobs.yml - Обновлена точка спавна с новым job_id
Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml - Добавлен компонент CartridgeLoader для LPPAdjutantPDA
Resources/Prototypes/_LostParadise/Entities/Objects/Misc/identification_cards.yml - Добавлена новая ID-карта для Административного Ассистента с обновленным job designation
Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml - Обновлены ограничения по видам для маркеров, исключив человека
Resources/Prototypes/Species/human.yml - Обновлены лимиты маркировки для человека с изменениями в значениях очков
Resources/Locale/ru-RU/cargo/cargo-console-component.ftl - Изменены строки локализации для упрощения сообщений о подтверждении заказа
Resources/Prototypes/GameRules/events.yml - Удалены несколько событий и добавлены категории для существующих
Resources/Prototypes/GameRules/roundstart.yml - Удалены несколько правил игры и добавлено новое свойство для TraitorReinforcement

Sequence Diagram

sequenceDiagram
    participant Player
    participant JobSystem
    participant SpawnPoint
    participant EquipmentManager
    
    Player->>JobSystem: Выбор роли Административного Ассистента
    JobSystem->>SpawnPoint: Проверка требований (возраст, время работы)
    SpawnPoint-->>JobSystem: Подтверждение
    JobSystem->>EquipmentManager: Выдача стартового снаряжения
    EquipmentManager-->>Player: PDA, гарнитура, рюкзак и т.д.
Loading

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@github-actions github-actions bot added Статус: Требуется одобрение Ожидание разработчиков для принятия решений Изменения: YML Изменяет какие-либо файлы .yml labels Jan 6, 2025
@Farrellka-dev Farrellka-dev changed the title hotfix 3 Hotfix 3 Jan 6, 2025
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 3

🔭 Outside diff range comments (1)
Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml (1)

Line range hint 1-6: Исправьте кодировку в идентификаторе трекера

В playTimeTracker используется кириллическая буква 'А' в значении 'JobLPPАdjutant'. Замените на латинскую 'A'.

-  playTimeTracker: JobLPPАdjutant # JobAdminAssistant # LPP Адъю трекер
+  playTimeTracker: JobLPPAdjutant # JobAdminAssistant # LPP Adjutant tracker
🧰 Tools
🪛 yamllint (1.35.1)

[warning] 5-5: too few spaces before comment

(comments)

📜 Review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 8890dc4 and a55e88d.

📒 Files selected for processing (5)
  • Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml (2 hunks)
  • Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml (1 hunks)
  • Resources/Prototypes/_LostParadise/Entities/Markers/Spawners/jobs.yml (1 hunks)
  • Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml (1 hunks)
  • Resources/Prototypes/_LostParadise/Entities/Objects/Misc/identification_cards.yml (1 hunks)
🧰 Additional context used
📓 Path-based instructions (5)
Resources/Prototypes/_LostParadise/Entities/Markers/Spawners/jobs.yml (1)

Pattern **/*.yml: так же в прототипах запрещены любые переводы на русский. Только на английском или ссылкой на перевод.

Все добавляемые прототипы должны быть в нашей папке.

Никогда не предлагать ничего по отступам

При удалении дополнительного дополнения по типу prob:, можно оставить оригинальную часть с - id:.

Resources/Prototypes/_LostParadise/Entities/Objects/Misc/identification_cards.yml (1)

Pattern **/*.yml: так же в прототипах запрещены любые переводы на русский. Только на английском или ссылкой на перевод.

Все добавляемые прототипы должны быть в нашей папке.

Никогда не предлагать ничего по отступам

При удалении дополнительного дополнения по типу prob:, можно оставить оригинальную часть с - id:.

Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml (1)

Pattern **/*.yml: так же в прототипах запрещены любые переводы на русский. Только на английском или ссылкой на перевод.

Все добавляемые прототипы должны быть в нашей папке.

Никогда не предлагать ничего по отступам

При удалении дополнительного дополнения по типу prob:, можно оставить оригинальную часть с - id:.

Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml (1)

Pattern **/*.yml: так же в прототипах запрещены любые переводы на русский. Только на английском или ссылкой на перевод.

Все добавляемые прототипы должны быть в нашей папке.

Никогда не предлагать ничего по отступам

При удалении дополнительного дополнения по типу prob:, можно оставить оригинальную часть с - id:.

Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml (1)

Pattern **/*.yml: так же в прототипах запрещены любые переводы на русский. Только на английском или ссылкой на перевод.

Все добавляемые прототипы должны быть в нашей папке.

Никогда не предлагать ничего по отступам

При удалении дополнительного дополнения по типу prob:, можно оставить оригинальную часть с - id:.

🪛 yamllint (1.35.1)
Resources/Prototypes/_LostParadise/Entities/Markers/Spawners/jobs.yml

[error] 6-6: wrong indentation: expected at least 3

(indentation)


[warning] 7-7: too few spaces before comment

(comments)


[error] 10-10: wrong indentation: expected at least 5

(indentation)

Resources/Prototypes/_LostParadise/Entities/Objects/Misc/identification_cards.yml

[error] 35-35: wrong indentation: expected 4 but found 2

(indentation)


[error] 37-37: wrong indentation: expected 6 but found 4

(indentation)

Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml

[error] 46-46: wrong indentation: expected 4 but found 2

(indentation)


[warning] 47-47: too few spaces before comment

(comments)

🪛 GitHub Actions: YAML Linter
Resources/Prototypes/_LostParadise/Entities/Objects/Misc/identification_cards.yml

[error] 44-44: No Content.Shared.Roles.JobPrototype found with id LPPAdjutant

⏰ Context from checks skipped due to timeout of 300000ms (3)
  • GitHub Check: build (ubuntu-latest)
  • GitHub Check: build (ubuntu-latest)
  • GitHub Check: Test Packaging
🔇 Additional comments (4)
Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml (1)

10-11: ⚠️ Potential issue

Исправьте кодировку символов в идентификаторе

В комментарии используется кириллическая буква 'А' в идентификаторе 'JobLPPАdjutant'. Это может вызвать проблемы при обработке конфигурации. Используйте латинскую букву 'A'.

-# - type: playTimeTracker # LPP It's JobLPPАdjutant
+# - type: playTimeTracker # LPP It's JobLPPAdjutant

Likely invalid or redundant comment.

Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml (2)

7-17: Проверьте баланс временных требований

Установлены существенные требования к игровому времени:

  • 10 часов (36000 секунд) в инженерном отделе
  • 10 часов (36000 секунд) в медицинском отделе
  • 20 часов (72000 секунд) общего времени

Убедитесь, что такие высокие требования не создадут проблем с доступностью роли для игроков.


54-57: Проверьте наличие новых предметов экипировки

Убедитесь, что все новые предметы экипировки существуют в прототипах:

  • ClothingBackpackHOPFilled
  • LPPADJUCloak
  • LPPAdjutantPDA
  • ClothingHeadsetCommand
✅ Verification successful

Все предметы экипировки найдены

Проверка показала, что все новые предметы экипировки корректно определены в прототипах:

  • ClothingBackpackHOPFilled в файле backpack.yml
  • LPPADJUCloak в файле cloaks.yml
  • LPPAdjutantPDA в файле pda.yml
  • ClothingHeadsetCommand в файле headsets.yml
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check if the new equipment items exist in prototypes
for item in "ClothingBackpackHOPFilled" "LPPADJUCloak" "LPPAdjutantPDA" "ClothingHeadsetCommand"; do
    echo "Searching for $item..."
    rg "id: $item" Resources/Prototypes/
done

Length of output: 1486

Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml (1)

51-56: 🧹 Nitpick (assertive)

Рекомендуется добавить дополнительные картриджи

Текущий набор картриджей может быть недостаточным для роли адъютанта. Рассмотрите возможность добавления дополнительных картриджей, которые используются в других административных PDA.

Предлагаемые изменения:

  preinstalled:
    - CrewManifestCartridge
    - NotekeeperCartridge
    - NewsReaderCartridge
    - NanoChatCartridge
+   - CrimeAssistCartridge
+   - SecWatchCartridge

Likely invalid or redundant comment.

@github-actions github-actions bot added the Изменения: Локализация Изменяет какие-либо файлы .ftl label Jan 6, 2025
@github-actions github-actions bot added the Изменения: C# Изменяет какие-либо файлы .cs label Jan 6, 2025
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
@github-actions github-actions bot added Изменения: Конфиг Изменяет какие-либо файлы конфигурации Изменения: Спрайт Изменяет какие-либо файлы .json/.png в текстурах labels Jan 6, 2025
Copy link
Contributor

github-actions bot commented Jan 6, 2025

RSI Diff Bot; head commit b04fd9b merging into 8890dc4
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Nyanotrasen/Clothing/Uniforms/Jumpsuit/summer_security.rsi

State Old New Status
equipped-INNERCLOTHING Modified

Resources/Textures/Objects/Materials/ore.rsi

State Old New Status
adamantine Removed
ammonia Removed
copper Removed
titanium Removed

Resources/Textures/Structures/Wallmounts/signs.rsi

State Old New Status
direction_lawyer Removed

Resources/Textures/Structures/Walls/rock.rsi

State Old New Status
full Removed
full_two Removed
rock_0 Removed
rock_0_two Removed
rock_1 Removed
rock_1_two Removed
rock_2 Removed
rock_2_two Removed
rock_3 Removed
rock_3_two Removed
rock_4 Removed
rock_4_two Removed
rock_5 Removed
rock_5_two Removed
rock_6 Removed
rock_6_two Removed
rock_7 Removed
rock_7_two Removed
rock_ore_diamond Removed

Resources/Textures/Clothing/Head/Misc/head_mirror.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Clothing/Mask/gascaptaincombat.rsi

State Old New Status
equipped-MASK-reptilian Added
equipped-MASK-vox Added
equipped-MASK-vulpkanin Added
equipped-MASK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Clothing/OuterClothing/Coats/cap_trenchcoat.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Belt/chaplain_sash.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Belt/chaplain_sash_overlay.rsi

State Old New Status
book Added
bottle Added
censer Added
crucifix Added
stake Added

Resources/Textures/_NF/Clothing/Belt/punk.rsi

State Old New Status
base_belt_01 Added
decor_base_belt_01 Added
decor_base_belt_02 Added
decor_base_belt_03 Added
decor_base_belt_04 Added
decor_base_belt_05 Added
inhand-left Added
inhand-right Added
mask_null Added

Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi

State Old New Status
base_glasses_01 Added
base_glasses_02 Added
decor_base_glasses_01 Added
decor_base_glasses_02 Added
icon_base_glasses_01 Added
icon_base_glasses_02 Added
icon_decor_base_glasses_01 Added
icon_decor_base_glasses_02 Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Head/Hats/bishop_mitre.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Head/Hats/cardinal_hat.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Head/Hats/kippah.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Head/Hats/pilgrim_hat.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Head/Hats/widebrim_hat.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Head/Hats/witch_hunter_hat.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_blue.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_green.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_magenta.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_yellow.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_NF/Clothing/Head/Hoods/cardinal_hood.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi

State Old New Status
base_halfmask_01 Added
decor_base_halfmask_01 Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Neck/Misc/crucifix.rsi

State Old New Status
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/Neck/Scarfs/chaplain_stole.rsi

State Old New Status
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_green.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_orange.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi

State Old New Status
base_OuterClothing_armor_01 Added
base_OuterClothing_armor_02 Added
base_OuterClothing_armor_03 Added
base_OuterClothing_armor_04 Added
base_OuterClothing_armor_05 Added
decor_base_OuterClothing_armor_01 Added
decor_base_OuterClothing_armor_02 Added
decor_base_OuterClothing_armor_03 Added
decor_base_OuterClothing_armor_04 Added
decor_base_OuterClothing_armor_05 Added
decor_base_OuterClothing_armor_06 Added
icon_armor_01 Added
icon_armor_02 Added
icon_armor_03 Added
icon_armor_04 Added
icon_armor_05 Added
inhand-left Added
inhand-right Added
mask_null Added
overlay_base_OuterClothing_armor_01 Added
overlay_base_OuterClothing_armor_02 Added
overlay_base_OuterClothing_armor_03 Added
overlay_base_OuterClothing_armor_04 Added

Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi

State Old New Status
base_OuterClothing_armor_01 Added
decor_base_OuterClothing_armor_01 Added
decor_base_OuterClothing_armor_02 Added
decor_base_OuterClothing_armor_03 Added

Edit: diff updated after b04fd9b

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Изменения: C# Изменяет какие-либо файлы .cs Изменения: YML Изменяет какие-либо файлы .yml Изменения: Конфиг Изменяет какие-либо файлы конфигурации Изменения: Локализация Изменяет какие-либо файлы .ftl Изменения: Спрайт Изменяет какие-либо файлы .json/.png в текстурах Статус: Требуется одобрение Ожидание разработчиков для принятия решений
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants